immodule: Fix includes

Make includes not rely on gtkimmodule.h including gtk.h. This will be
important once we remove gtkimmodule from the include files.

That way, we can achieve not pulling deprecated headers automatically.

diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index 093a557d9b2b2a16cde99dfc120d777a5b50cd93..de03fda507915197df0d543748b25be6fda5f8ec 100644 (file)
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -38,6 +38,8 @@
 #include "gtkprivate.h"
 #include "gtkintl.h"
 
+#include "deprecated/gtkrc.h"
+
 #define SIMPLE_ID "gtk-im-context-simple"
 
 /**

diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index 5d2164324523416ca8f396994dacfdb8b7477598..dee54ec1743da9aae725ae3b493bfe34ed0696d0 100644 (file)
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -24,8 +24,10 @@
 
 #include "gtkimmulticontext.h"
 #include "gtkimmodule.h"
+#include "gtklabel.h"
 #include "gtkmain.h"
 #include "gtkradiomenuitem.h"
+#include "gtkseparatormenuitem.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
 

diff --git a/gtk/queryimmodules.c b/gtk/queryimmodules.c
index 3e01bf06326860720091ffd5d6dc1ae9b14e99b6..2c7aa772c605f97412d6e095b277c384bfb336f2 100644 (file)
--- a/gtk/queryimmodules.c
+++ b/gtk/queryimmodules.c
@@ -39,6 +39,7 @@
 
 #include "gtk/gtkimmodule.h"
 #include "gtk/gtkversion.h"
+#include "gtk/deprecated/gtkrc.h"
 
 static void
 escape_string (GString *contents, const char *str)